Merge "app: aboot: Fix compilation error for APQ8009"