Merge "Unversion NDK stub libraries." am: 0b4540f867
am: 17eea8c807

Change-Id: Id21465810bf682dbc4ff75eaec8a6bc83b98a889