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

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