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

Change-Id: I69158ea8986d3b2b2046696ada0ebe75aa2d948e