Merge "TaskRunner: move implementation to cpp" am: 13732d54ff
am: 5eb37088c5

Change-Id: I5424c020466e3ae9df9862b483f99a80ffa51c7d