fix bug
Merge github.com:17043983/robolectric