Merge "Stop running RecyclerViewCacheTest on pre API21 devices." into nyc-mr1-dev am: ac6323a688
am: 39725ee09b

Change-Id: I7132d54cbc37ebd219996629872770ba48494bc8