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

Change-Id: Ie2e557a8f5bd1e2216e29b0422aba38da54e8c8e