Merge "Merge "Merge "Merge "Merge "AnimationDrawableTest will fail when AnimationDrawable created from cache" into lollipop-mr1-cts-dev am: 44738771c9" into marshmallow-cts-dev am: 5483fb6a0e" into nougat-cts-dev am: fd86d39a38" into nougat-mr1-cts-dev am: 8a330a1a38"