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

Change-Id: I7cc145b28b65e742147a86af9d081cacd5ae18c9