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

Change-Id: I3523c1efcd97b78bdcabf66de2a840574d07b364