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

Change-Id: Ibee6b1523f195a17b534d68e0978b673215c3ea3