Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am: 6981afc6ac  -s ours am: efd392db1d am: d4b1c832c9
am: 0748e8945e  -s ours

Change-Id: Ief4bd9419931bd2a1158445d110b313c8a777af7