DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 9a4768f7bf am: da3cba194b am: 61bb7a0d99  -s ours am: 75dd199ec4 am: 7e12739f4b am: c06be67278 am: c384315748  -s ours
am: b4a39f222d

Change-Id: Ic7d9cb49f3f638f2aab576b28305c92c26da8cb0