Merge "Finish moving Robolectric tests to tests/robotests" into tm-qpr-dev