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

Change-Id: I80699a6c3943e3dd665a94716ee1dad65bdef953