Update to android-support v20