Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev