am 3c385b3f: am 16b7dc9c: Merge "Merge all shapes/paths caches to PathCache" into jb-mr2-dev

* commit '3c385b3fc08ae2fc5325d0dd4f64d462edf3aad8':
  Merge all shapes/paths caches to PathCache