Merge "Drop .stubs from android.test.[base|runner|mock].stubs"