Merge "Move VelocityTracker.cpp to target build only"