and AGP 8 build errors