Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 am: e2b4d4a38a
am: 22f0b9d1ae

Change-Id: Ie6abad6c56a55cd67c22903cd9d60bd907d45e9b