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

Change-Id: Ie0d9b0bc8ba702a9b54be2c690fe7de8d8820e02