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

Change-Id: I00e5d507d17dbd98d04809e08d29f8b635a1642f