[automerger skipped] Merge "Added Media Codec Test methods" into oc-dev am: 647a0914b3
am: b361a96e2e  -s ours

Change-Id: I8470c4ba5e563fe3825a8afae71ea674c6a5ea44