am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."

* commit '613945011ef9f79388a1cf21acf514154e2d5af2':
  Support a new ANDROID_AAPT_IGNORE env var.