Merge "Change robolectric genrule to host variant"