[RESTRICT AUTOMERGE]: Revert "Update CVE-2021-0338 to be dynamic compatible"

Bug: 175816890
Test: none

This reverts commit 2c19bc3ddec6838cb17d4d4bc38c5a780a27cabd.

Reason for revert: too much work on qt

Change-Id: I16513c6663364298561c7092fada584258ee57ee
2 files changed