am d7252571: Merge "Add --error-on-failed-insert option to aapt."

* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
  Add --error-on-failed-insert option to aapt.