Merge branch 'cm-11.0' of https://github.com/temasek/android_frameworks_base into HEAD

Conflicts:
	services/java/com/android/server/usb/UsbDebuggingManager.java

Change-Id: If990f8435d8a774f5e1a2636293673dd0b4210eb
Revert "reduce cookie tracking (3/4): add a way to count cookies"

This reverts commit 167110867bbdabb72d8ce291d596bd8f471b74d6.
Revert "Add new drawables for download pause/resume"

This reverts commit 2e9a8e60d3a894245fdc862f404233acfeb6a4fd.