Merge "Updating metrics proto to be more generic and allow extra data to be added." am: e16afeffaf am: 9545d4e8d9

Change-Id: I2bd949296b5a4eeeacd7ad101c7791563d5b7c3d
tree: c2bd54e9668657993b44abee58ac0da07491d1a0
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg