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

Change-Id: Ic5c6429839f1e25d34d78155e6fb327a9f7a055d