Merge "Build FrameworkStatsdTest test against the sdk" into rvc-dev am: edda9945 am: 2a619fcd am: d46ab492 Change-Id: Ic6d470825723a7fbeec99aa36112f92ca9919701