edison: bluetooth and media_codecs fix

Change-Id: I7295fbe7edb3cf6da6430eb199c2535f885d9db9

merge

Change-Id: I29569769088ad40bb5fc219dbc6c9ab3defee216
fix

Change-Id: I64b70218d0cfe39ebb8d083d701ffd85ac3fd4aa