Merge \\"media: add asString for new OMX layering params\\" into nyc-mr1-dev am: e500bfe46f
am: 35e677e807

Change-Id: I71c35f751b98231b89007493d198e23b69a2ceb2