Merge "Fix HWUI Path Cache dangling pointer"
am: 37bf3ec9d2

* commit '37bf3ec9d2fb3dfdccfe043e51723e4e543f0703':
  Fix HWUI Path Cache dangling pointer