Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am: 6981afc6ac  -s ours am: efd392db1d
am: d4b1c832c9

Change-Id: I3a58ea5c113f24ca9d86a0d49d9bddff30be6a5c