Merge "Use prebuilt android.test. stubs jars for app builds"