Merge "Add an explicit definition of __ANDROID__=1"