Merge "Remove unused NDKs." am: 88d64064bd am: c41613541a

Change-Id: I411d5b06dcface3ee38de256a43f482b425a3a9d