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

Change-Id: I0c01283a73c4fdbc8bcfde17dec5a918e5fe1149