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

Change-Id: Ia6831ce8b12461719321b444bd4475eb3eb6fa1c