Merge "Move MediaMetrics into its own library" into oc-dev
am: 630671a603

Change-Id: I9e50c1dedbc5aa2c744f5629c858443bc698abad