Merge "Update backwards compatibility support for android.test.base"