Android 6.0.1 release 9
am 208857c3: am 20eeaa9c: Merge "Switch to the public NDK API for bitmap"

* commit '208857c3bcad68ca82d633d49ace9bee5c392cbd':
  Switch to the public NDK API for bitmap