Merge "Fix memory leak in ShaderCache" into pi-dev am: e275d0bc19
am: d00eedd25b

Change-Id: If8311555a24baaef993cf4d757f44af8a156bfd6