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

Change-Id: I4c7505b0dc7e5de2a1ff2278e2aafd4e031b4169