Merge "Re-enable the A2DP unit tests"