AP_InertialSensor_MPU6000: fix rebase issue