Merge "Fix media option settings for A2DP." into eclair