Merge "Unversion NDK stub libraries."
am: ddc7ac8ba6

Change-Id: I0cf382ae983796b948acfe84e1bb9b639de86a65