Android m preview
am 20eeaa9c: Merge "Switch to the public NDK API for bitmap"

* commit '20eeaa9cdee7aa28d456f4a7ac3d494950c5aa1a':
  Switch to the public NDK API for bitmap