Merge "Remove unused API definitions from development/ndk." am: 1a62617b04 am: 5ecf567053
am: ea71ff1242

Change-Id: Ie502f2eac2d3a90d0c05c31dfe1dd2846c24025b