Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba  -s ours am: 563b100957  -s ours am: 4636e7256a am: 44071d00a7
am: f95caa3506  -s ours

Change-Id: I0a92cd56f3a63f0eedc3667de098fef967fdd5c8