Merge change 23529 into eclair

* changes:
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.