Merge "Use binary resource support in robolectric"