Merge "Unversion NDK stub libraries."
am: 3944ec426b

Change-Id: I3266580d6f41b32ec8775e0bb73c66303ed5fa62