Merge "Update backwards compatibility support for android.test.base"
am: 617e556477

Change-Id: I05a06bfc724f204e28f995912e31c4ebd3135cac