Merge "Remove more crap from development/ndk." am: e1a02090e9
am: 464eec1dd7

Change-Id: I2e9f0899358eeab28fa42cb2dd9fcfc80eaebcd0