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

Change-Id: I1987358c9b524bc1bd3863f0653947ba7d09407e