Merge "SystemServer: Looper's getMainLooper to return ServerThread"