Merge "Rotate the image based on EXIF" into marshmallow-cts-dev am: 21ce26ba87 am: 93f8b18c5f am: 6402dfc3e4 am: edb3143296
am: fb90c572ab

* commit 'fb90c572abe6ed5677367b03b2a3d307ae04aec0':
  Rotate the image based on EXIF