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

Change-Id: I80ac650c2332e5e5109b942d247f55e5683aeef3