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

* commit '05dc201ff64f6324c2726a8841af7021e7071b97':
  Remove Bitmap#getSkBitmap