Upgrade to latest android plugin
Clean up. Do not need the support lib.