Merge "Support IMapper@3.0 in OMX VTS" into qt-dev
am: 56e9dd901e

Change-Id: I5f05c76194a5a29aa31216dd06a85b82a6ca7539