Merge "hal: msm8916: Fix for vndk compilation errors"