am 47e6c4be: am 932e59fc: Merge "Create a pixelref wrapper for reused bitmaps" into klp-dev

* commit '47e6c4be1e1ef0f377aed7be773a070f3bfa4a13':
  Create a pixelref wrapper for reused bitmaps