Merge "Mock sourceDir for ActivityThreadClientTest" into rvc-dev