Merge "Remove hidden API usage in ExifInterface"