am 3564d9ea: am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb

* commit '3564d9eada7ae3f40bc4c80272fbbb867f04e018':
  Properly rotate video that's marked as such and decoded to a surface.