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

Change-Id: I88c7e067a8052b63afc47ae40a2696d30531b552