GENERAL
Re-applied patch for Android SDK naming
Renamed Logging macros that were conflicting with 5.5 functions