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

Change-Id: I3871fc9393cdabe0eebae30f87d2d2555ddf6dfc