Merge "hikey960: enable the bootcontrol hal for hikey960 build"