Merge "Rename to TestableTests.apk"