Merge "Remove robolectric build targets"