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

Change-Id: If8145c8aa89545aa4668afc7f1e4d8577b36b6d5