Merge "omx: add asString for new enumerations and fix some issues am: 1b9c8069f4 am: 782ac39b9b" into nyc-mr1-dev-plus-aosp