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
am: 44071d00a7

Change-Id: I77cec5a8c8de37ea691fc0e2ba81a3dc641528d8