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

Change-Id: I6f368faec00c598dc2aa9096156c28ba609513d1