Merge "Refreshed gcc predefines __ANDROID__"