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

Change-Id: I7cff8e044a7512807afb9646f3283df353216482