Merge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev