Merge "Drop .stubs from android.test.[base|runner|mock].stubs" into rvc-dev-plus-aosp