DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d am: c5251a627c  -s ours am: 18f84821f6  -s ours am: a6d4a2a14c am: 6048921526 am: 638ae0ac2c  -s ours
am: 3b1730dd5d

Change-Id: Ide5ddfd14d4a5a2a4620557f9fe530a982fb045c