This reverts commit 0975a412b3.
Reason for revert: This broke qt-dev-plus-aosp
Change-Id: I988fe46a7bb810d7c2379e0472404345fd51b685
This reverts commit 0975a412b3.
Reason for revert: This broke qt-dev-plus-aosp
Change-Id: I988fe46a7bb810d7c2379e0472404345fd51b685