Merge "Purge more of development/ndk."
am: dc4e0eb605

Change-Id: I209a922d4072950ef13a189c4d27f337cb2551a3