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

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