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

Change-Id: I27d0a6c9f4129210c676002e553f50bdf07a8c8c