Update for API 18

bug 7968563
New defaults for createFromBitmap

Change-Id: I224e27cd01ba5502cb833221ac731384785108eb
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1