Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev

* changes:
  DO NOT MERGE: IOMX: work against metadata buffer spoofing
  DO NOT MERGE omx: check buffer port before using