Merge "Added missing mGlobalLock in system server" into qt-dev am: 68423d1491
am: 70b4c44d97

Change-Id: If486eaeca5ef8ca6a17428c853f973b601af9660