Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-mr1-dev
am: 6b5d4723d2

Change-Id: Ibbae908c61926aa2d9e7387cfb4752ad202aeee5