Merge "Unversion NDK stub libraries." am: a4684029e1 am: c5306c2c4a
am: 53d7eda84e

Change-Id: I4843181dd734134788eb65cccc73c417ffb912a2