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 am: 8c02795ab6 am: db39c9e711  -s ours am: 20d7cfb6d9
am: 64ad5feeb4

Change-Id: I94ba979aaf96e4c88f8c1129eb1a5c168e72df8e