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

Change-Id: I56ceafb7b2293b59af00d1b7cc822feb975be35e