Merge "Fix null pointer deref in libsensor SensorServer"