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

Change-Id: Iceb2bac4fba1b18646e04250187f29da869003ca