This reverts commit d83c2cc22b.
The previous landing broke checkbuild targets due to namespace issue.
See the commit message for hardware/qcom/msm8998 change.
Bug: 34254109
Test: Build and boot taimen on device to home screen.
Test: Sideload on taimen.
Change-Id: I775026345eb5fc0ec580ba4ca0282835106a1d35
Merged-In: I775026345eb5fc0ec580ba4ca0282835106a1d35
(cherry picked from commit 4fa8e49020)