Move non-Java commands over from frameworks/base