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

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