Merge "Add android:usesNonSdkApi manifest attribute"