HuaweiQualcommRIL: fix for CAF merge