Added -a option to android sdk update
Merge branch '3.5.0'