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

* commit 'ad75bfca008317b0f2024e916f04ab8c4ebbe6c2':

Change-Id: I927613feb2f2c761b324752d3330aa179de72a8d