Revert to revision 21 of the Android SDK and version 3.5.0 of the android-maven-plugin; trigger build