DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
am: 1b5d5bd119  -s ours

Change-Id: I6c218970581361c195471ee435f5a91b109911f0