update for new android studio + build tools