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

Change-Id: Ic8b18c2e4fc86717e0fe5c3090c5e7cbaf9b05d6