am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev

* commit '01b321de0bd179a1366c5f344fa1b094571fd5f4':
  Remove Bitmap#getSkBitmap