Merge change 3577 into donut

* changes:
  Make aapt Error out when an overlay adds a string.