Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"