Backport robolectric 3.1 from master to mnc-ub-dev

Change-Id: I8247febbb396dd1f75cb375937a270abf3bc61fb