Merge "Handle EXIF orientation in hwui/ImageDecoder"