Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
am: c36e3e7fff

Change-Id: Ic680329647398f52a0d28633aa209e37556c1e31