Merge "Update SDK Tools to 24.0.1" into studio-1.0-release