am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI"

* commit '24c16b7e4cdbacedd33347a01ff4944abfc86218':
  Frameworks/base: Fix AssetManager JNI