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

Change-Id: I958306416861a8031842c3979ae994020212a731