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

Change-Id: I6e0dd790ac8c113b21bfa039cae9bab1a0d22d45