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

Change-Id: I3f7d6bf6f13ad69589a2105444c874fd31eeed05