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

* commit '0b1c17bd314ab093e8455077b1740e30b6189c02':