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