Switched to official android support library