Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba  -s ours am: 563b100957  -s ours
am: 4636e7256a

Change-Id: I8785b7aaee1c5d7b5061faa32c2b86b9f34f2339