Merge "Whitelist supported codec in omx test." into oc-dev am: b63ae5473f
am: 939e5a1f76

Change-Id: I5ca3800f141526d882f68bcf434163657c5a9a9e