am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp

* commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9':
  Support post-decode video rotation.
tree: 67ef9d6740c34095114a56f767cdd4209ae74109
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/