Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into nyc-dev
am: f54d735826

Change-Id: I1e8f842ba5215f440de9f888f51f62a08a84cc87