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

Change-Id: I25d737e2db6314d78e995e22cb971ff5037d2796