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

Change-Id: Iacf84cc03329107602643009d143c2211b97398d