Merge "Add preliminary support for NDK r10c" into lmp-dev