Merge "Split android-non-updatable-stubs-defaults in two"