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

Change-Id: I97feb6b49cec6eca8b1e0558a992b6893e17d8f5