Merge "sensors: correct the ambient light and proximity sensor sysfs path"