legacy OMX: update and cleanup

Change-Id: I42a4bd52a6c9a4abdb3c616cc79932a943be6c6e
Merge "legacy OMX: update and cleanup" into jellybean