Worked around the random CTS testOtherH264ImageReader & DecodeAccuracyTest failure. am: dfc4b4b2ca
am: c931ff2293

Change-Id: Id707166973c801f33d1bf02fd138d5a8aae75e95