fix build

Change-Id: Iaab5267df51477695e409ecb8e728f3d4cc9c034

Conflicts:

	packages/SystemUI/res/layout/halo_bubble.xml