Merge "Revert "Fix bluetooth and aac dependency"" into tm-dev