Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am: 6981afc6ac  -s ours am: efd392db1d am: d4b1c832c9 am: 0748e8945e  -s ours am: 0676b43165 am: 109a42f811 am: 809027b0bf am: fdd84ef103  -s ours am: 9bb785b7a6 am: 64ad9c1508 am: 37490f8c21
am: 94a93f0e92

Change-Id: Ia769c9127c8eb6a3437893af11440df1b2ed2064