cleanup related with updating Android SDK to 4.1