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

Change-Id: I2195622e07cc47c1c922664941f527d92260e4ef