Add a shape class and command class for Android.