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

Change-Id: I8281b233acd6ff226964b7d8b9a5702cf74d18cd