Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1
am: 9c7f0824be

Change-Id: Ibd31110a7191c39b09947f5026c2c50af3e0146c