Messed Up Merge!
HALO cleanup (3/4)

hdpi and mdpi drawables were inconsistent, if you plan to use HALO on
lower res devices you must reproduce them.

Change-Id: I2746837bacd60c3079ace4c7523a68b8cd415f5f

Conflicts:
	core/java/com/android/internal/widget/ActionBarView.java