Merge "Remove dependency on platform-system-robolectric"