Merge "Fix possible zombie thread for DecodeAccuracyTest" into oreo-cts-dev
am: c900e834d8

Change-Id: I756c04ad00046e76548b853aee6e4850dc06a636