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

Change-Id: Ib5826f7bd873df2b667ef51af403e316e8d01587