Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and...

Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev am: c6ad7d76
am: 51dbe482

Change-Id: I948e76bd926d2a8165196149c75697f7b96e5f6e