Merge "Fix layer cache memory leak" into master-skia

https://skia.googlesource.com/skia/+/b32f0ad89119625feedb4f0403bbbc94fae44668

Change-Id: I84416896a05b1860e714111baef32563bbeb69f9