Merge "Add CTM to the cached layers' key and reduce render target pingponging in layer pre-rendering" into master-skia

https://skia.googlesource.com/skia/+/0c42332

Change-Id: I7be84c494b139a24ea3a7a4ccef113d506905f72