Move back to Android compat v13 & platform v17