[automerger skipped] Merge "Merge "Remove soft omx libs from package -- DO NOT...

[automerger skipped] Merge "Merge "Remove soft omx libs from package -- DO NOT MERGE" into qt-dev am: 99d493fd am: 7e6250e4" into qt-r1-dev-plus-aosp
am: 6732a8d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I6ec97b3837b453ec448f499908872da4a2abac31