Merge: Work towards an Android testing framework and fix a few bugs