am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"

* commit 'c095eb04fa931c1d838fc4505089502ecc9eba62':
  Fix CacheBitmap crash issue when using H/W UI rendering