Merge changes from topic "more-ndk-binder" am: 72021ee221 am: 59915bd741
am: 71975baf8a

Change-Id: I55bba9cd086b65b698e08c82d523bd5b8de84c4d