Revert "Revert Cls stopping now-master running on googlefood"

This reverts commit 7bc272a11b701a32d2ed91277341c382cbd84aeb.

Conflicts:
	src/com/android/launcher3/BubbleTextView.java

Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
22 files changed