Upgrade SDK Tools (rev 24.0.1) and Build-tools (rev 21.1.2)