Merge "mediaplayer: remove use-awesomeplayer developer option" into mnc-dev