Merge "Add support for NDK r13." am: 287093a98c am: ae49ab2f0f am: 56745f6c7b
am: 072cfe202e

Change-Id: If86af2055a0aa62ebc6ce400645417eb059bc9b1