cleanup related to update to Android SDK 4.1