Merge "Allowing OMX.google* codecs for Devices launching with S am: 1e8510120f am: 50f251af37 am: e11e06d37a" into tm-d1-dev-plus-aosp