Merge "Add stubs for android.test.base"