Fix derps

Change-Id: Ia4dbc2335657c096c34349ec67c4adfec0aeb91b

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java