Two small tweaks to android testing

Android bot has been having some problems. A few details in the commits.