Fixed aapt warnings

Change-Id: I35389697266b3ec59a38b4142a8983d0a8cc31ac
lights: Add framework support for additional lights

Change-Id: I4d12ee16e11ab584b102b7114ba3647336efc988
Phone: Sprint MWI Quirk: Phantom message wait indicator workaround (2/2)
Fix headset detection.

Original CM Commit below by Shelnutt2
Services.jar: Reworked computeNewHeadsetState function to
set state in a manor used in ics. This allows states such
as 129 and 130, which are used for 35MM_HEADSET to be
correctly registered as a new state.

Change-Id: I3bd1ec17d0cd184593edf330f482f09396785e76
Merge remote-tracking branch 'cm/kitkat' into kitkat