am faeabc7b: Merge "Cache resource ID lookups in aapt"

* commit 'faeabc7bcf760a4576637551d8bb578ae08a506e':
  Cache resource ID lookups in aapt