am ab4ebeb8: am c301ab8d: (-s ours) Move aapt2 off HAVE_MS_C_RUNTIME.

* commit 'ab4ebeb8f8f2aa40f735442ad229166f36b4839c':
  Move aapt2 off HAVE_MS_C_RUNTIME.