This reverts commit 7eaf9f92. Reason for revert: broken targets hikey/x86_64 Bug: 123590866 Bug: 123591405 Change-Id: I0f4ad13950ffe1ae84539ad439f49f461265b717 Test: N/A