updated to 21, some android studio update changes