Merge "libbinder_ndk: rename things according to convention" am: 37465f9256 am: 58edc4c7bb
am: 77847f7ec7

Change-Id: Ib663035a57fb411f0e37f19bcd1fa79a2d79348d