Merge "Add android:usesNonSdkApi manifest attribute" am: 9446fbbeb8
am: a872cb1fcc

Change-Id: I489673fe1b36c146b9b64f3da434b853e002a472