DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2

Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1
related-to-bug: 4381047
1 file changed