am bf5b71f0: am d99aae11: Merge "Reset libc targetSdkVersion"

* commit 'bf5b71f0e8ee2011d635078573493f6c7b8134af':
  Reset libc targetSdkVersion