Merge desktop and android driver into browser driver
finish merge