am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2

* commit 'c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42':
  DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
tree: 780c93d157bffddf214448fd94218e465cc98fa2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/