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

Change-Id: Ic685c51486bdcb58fa7879e7ad7d85d92bea2bd3