Revert "Snap for 5187456 from 9638c086ee0c5a0f75e7c76522a0ecb5b5956d78 to qt-release"

This partially reverts commit b71447238ef4aa1e4aeac4e9a0b61ab70b35cd5a.

Reason for revert: Breaks loading of libRS_internal.so.

Change-Id: I43e010b342f31e6019f0b8736793a7d504d9f124
(cherry picked from commit 25798ba30af628c43328e8d9879ab90d6581d028)
7 files changed