Updated to buildToolsVersion 20
Merge remote-tracking branch 'remotes/origin/MadMine' into MadMine