Changes for new Android Sdk