Android plugin upgrade fixes

Upgrade our plugins to use the new android plugin minimum requirement for android studio.