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

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am: 6981afc6  -s ours am: efd392db am: d4b1c832 am: 0748e894  -s ours am: 0676b431 am: 109a42f8 am: 809027b0 am: fdd84ef1  -s ours am: 9bb785b7 am: 64ad9c15 am: 37490f8c
am: 94a93f0e

Change-Id: Ia769c9127c8eb6a3437893af11440df1b2ed2064