Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev...

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025 am: 9c7f0824 am: 56100a30  -s ours am: 563b1009  -s ours am: 4636e725 am: 44071d00 am: f95caa35  -s ours am: 483c0d40 am: 43d4b759 am: 8c02795a am: db39c9e7  -s ours am: 20d7cfb6 am: 64ad5fee am: 9337971a
am: f20be749

Change-Id: Ic8d6f7a94aff287406cc3f75681ee45c3eceb079