Merge "Fix race condition in AwesomePlayer"

        mLock.unlock();

        status_t err = mConnectingDataSource->connect(mUri, &mUriHeaders);

        // force connection at this point, to avoid a race condition between getMIMEType and the

        // caching datasource constructed below, which could result in multiple requests to the

        // server, and/or failed connections.

        String8 contentType = mConnectingDataSource->getMIMEType();

        mLock.lock();

        if (err != OK) {

        mConnectingDataSource.clear();

        String8 contentType = dataSource->getMIMEType();

        if (strncasecmp(contentType.string(), "audio/", 6)) {

            // We're not doing this for streams that appear to be audio-only

            // streams to ensure that even low bandwidth streams start