Update to follow framework.

Change-Id: Ib6e54f8843f51ea53859bcb5852befdaa19f0910
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/android/magicsmoke/MagicSmokeSelector.java