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

Change-Id: I9a78875432e05918c574c9d8ea89230067b811cc