Merge "Unversion NDK stub libraries."
am: 0b4540f867

Change-Id: Icb81885c0846ee4f4ef24456d90ee46022c0fd00