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

Change-Id: Iea66b6911d07f97de44537f6f5564211932cba69