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

Change-Id: I4ef7a583a1d17ff6c2b572bc5a3f4f9da7dc5c38