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

Change-Id: If4da571c1b729766fdb6578aabcb7b4f3f45a03f