Merge "Update Bitmap#prepareToDraw doc" into oc-dev am: d4fff1565b
am: 27caadd2c4

Change-Id: I403d0a52958c7bf2720f078f5db140e3a3c3ebe7