Merge "Revert "Use android.test.base.stubs instead of android.test.base""
am: de2ac7e175

Change-Id: I877b4dd6f3dccb161fbb9d3d93b51070ae81d292