Merge "Allowing OMX.google* codecs for Devices launching with S" into tm-dev