Merge "Use __ANDROID__ instead of __BRILLO__."