Properly fix build to keep up to date with fucking android build tools