Merge "Make BitmapFactory.Options API Changes"