Merge "libbinder_ndk: rename things according to convention"
am: 37465f9256

Change-Id: I0802570fabdcb042abe5b2d78399287fbc94a254