Fix the issue Browser freeze when dragging the page and rotate the phone at the same times

When drag event is cancelled, the tab removing isn't needed. Or if it is the last one, browser will be closed and windows manager may be ANR.

Change-Id: Ia786d98727cecbe303cf9d153a471fd4a165b797
Author: Weiwei Ji <weiweix.ji@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 30621
Allow enabling WebSockets from Labs Preferences

Change-Id: Ia0dc06cbd4f2e8e340a8f8ee910a6310a5079d79

Conflicts:
	res/values/strings.xml
	res/xml-sw600dp/lab_preferences.xml
	res/xml/lab_preferences.xml
	src/com/android/browser/BrowserSettings.java
	src/com/android/browser/PreferenceKeys.java
Change-Id: Ia0dc06cbd4f2e8e340a8f8ee910a6310a5079d79
Revert "browser: Privacy Guard support"

This reverts commit 0c52be4ee9cbb6b93f47c79faa74d8cf2ca985e4.

Change-Id: I56ac8dcd5081c5cc824eafcfb528109817371679
Signed-off-by: Dan Trifan <jimsth@gmail.com>
Merge "Allow enabling WebSockets from Labs Preferences" into jb43