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

Change-Id: I694a8b89a9a4202fbca9bb91eb6434ce02957e02