Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev am: 106aeb324d
am: 0764ce28cf

Change-Id: I59a84542c4cfc2cb48627396642dd2d4bbdc2291