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