Merge "Convert remaining RecyclerView Android tests to JUnit4." into nyc-mr1-dev