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

Change-Id: I1273d10bdfa802d1de527ebceffcef3bbc2129c9