Merge "MediaSession2: Fix bug in runtest.sh for finding test apk"