Merge "hikey/hikey960: Fix powerHAL not loading" am: ea370f3c07
am: b62dd0ef2e

Change-Id: Idd8646671884c51705b5ce28db17bfc9b4f67462