Merge "Build FrameworkStatsdTest test against the sdk" into rvc-dev am: edda9945cf am: 06bd81e5f8

Change-Id: I682e9185ee02266afce34bfb4a7f146141f35cd3