DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 86369364a0  -s ours am: 97f82679d8 am: 2815b127e0 am: 8eca7511cc  -s ours am: 6d54c422cf am: fc936d5a6e
am: 0e134eae28

Change-Id: I9d6ec175abbc74168d8cebb2822f3f440ef48be1