Merge "Build FrameworkStatsdTest test against the sdk" into rvc-dev am: edda9945cf am: 2a619fcdec

Change-Id: Idb3571d9b3e85dd0805158bcff4536177f508e91