Merge "Use prebuilt android.test.base.jar for app builds"