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

Change-Id: I264ef276b7e464f56e9b93df13cd8618eddc66bc