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

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