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

Change-Id: I9ad5a85431e0ea747fff208430b3a61826674b62