Merge remote-tracking branch 'upstream/cm-11.0' into ose

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	core/java/com/android/internal/widget/multiwaveview/TargetDrawable.java
	packages/SystemUI/src/com/android/systemui/SearchPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java