Merge "Stop running RecyclerView prefrech tests on pre API 21." into nyc-mr1-dev am: 2750d740df
am: 0e52c57d1f

Change-Id: I55be483c96a22235e5ac6c18ded9ee95d44fe7fc