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

Change-Id: I66e99eebe063d99ff21727197bc02ae6d9597edf