am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.

* commit 'f7243dcc616bc9bd84fa519356babb15d6f17e7d':
  Add --error-on-failed-insert option to aapt. do not merge.