Revert^3 "Update the BackgroundThread dependency"

This reverts commit d47fc309e4e3c35acfd3959fd075cc060e9f803b.

Reason for revert: Fixing the revert.
Change-Id: I73ab752c9469cd19778d822d59e7675656bb8854
3 files changed