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

Change-Id: Ibbcbd7ae010cf824c7e26aef15af1e788210e2de