Merge "Unversion NDK stub libraries." am: 879fc83ad1
am: 5e650e53ff

Change-Id: I64aef67c54a3cda34aaf01a5f5bbf69364a9cd70