Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into nyc-dev...
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into nyc-dev am: f54d7358 am: ceafdd9b
am: 9fd86522
Change-Id: I7cff8e044a7512807afb9646f3283df353216482