Merge "Unversion NDK stub libraries."
am: 879fc83ad1

Change-Id: Iabff159275551a9944f1e8fe39e9ef3d3f9f1079