Merge "Frameworks/base: Fix AssetManager JNI"