android buildbot fix