Revert "Fix MAP SDP record generation [2/3]. (Lets just call this a Bluetooth Fix!)"

This reverts commit 7fc039e6abeb7fabc28f1343580924ebc885f9b8.