Merge "Revert "Build FrameworkStatsdTest test against the sdk"" into rvc-dev