Merge "Unversion NDK stub libraries." am: 0b4540f867 am: 17eea8c807
am: 34df2b45c1

Change-Id: I86d832f16cff2445dc5c85e3f6c4419535b236ca