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

Change-Id: I77a8279dc7829fb7637d8f3620ea5840ee52088a