Merge "Unversion NDK stub libraries." am: 879fc83ad1 am: 5e650e53ff
am: 579b873088

Change-Id: I0e02f8c677182d04caeb9d44838e5c2dc252ad4d