Merge "Unversion NDK stub libraries."