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

Change-Id: I57440577773e47f60e6af4e9112523b78741f9fa