Merge "Add Robolectric 3.6.1 prebuilt"