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