Fix Options test. Update Robolectric.