Merge "Cache resource ID lookups in aapt"