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

Change-Id: I2d21ab6008eed4d3459d1c5f272bce4d80300b11