cleanup derps in SunBeam

Change-Id: Iaec9353a247df91fe4be33ccdddee3533ff53280
Merge remote-tracking branch 'th/jb-mr2' into jb-mr2

Conflicts:
	src/com/android/sunbeam/SunBeamSelector.java

Change-Id: I027346257785b7e8c18a35cb39d50e7f44b5ede1