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

Change-Id: I985aae1a055c6684e791815e8fef90ff0f5e4ca3