Merge "Refactor use of __ANDROID__ macro"