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

Change-Id: Ia47164a731eea1bc93e9a1259b0d13127ec388cb