Merge "Fix robolectric update script to match external/robolectric-shadows"