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

Change-Id: Ib43360bc65aba8fc34967f665386a6ad3b6e4160