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 am: f95caa3506  -s ours am: 483c0d4053
am: 43d4b759f5

Change-Id: I08467f8432376d4f19bee0747e88c1b195f68693