Merge "MediaBitstreamsTest: adjust keys s.t. metrics are copied to results" into oc-dev am: cf176673d5 am: 0cafe01b44
am: f069589def

Change-Id: I9b36e44a8ff48bd2ae4f8e42634bf1a07448271a