Misc gradle changes re sdk version