Merge "Add support for NDK r13." am: 287093a98c
am: ae49ab2f0f

Change-Id: Ie8530ae07fb60b2dd15d2d88cecf9fad1458a337