Merge "hal: Fix build error for battery listner module"