Merge "Purge more of development/ndk." am: dc4e0eb605 am: 6bfc2e6751
am: 714fd9a806

Change-Id: Ifa020ff35fd51a4aae7738a9f7550c72ddeddd2b