Merge changes from topic "ndk-binder-convert-java" am: 48ac1c65a1
am: 752f4af1ed

Change-Id: Ic350a8ca63127e2834f127965a6b0ffa99ed86f6