Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier