Switched to new Android build sdk