Merge "Use BitmapFactory width/height for an image" into mainline-prod