Merge "Remove a few libs used by soft omx from vndk" into qt-dev