Merge "Add support for NDK r13."