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

Change-Id: I622978a0a22d3e4b416c5a5dccbdb15c753b6562