Updated Halo from gerrit.paranoidandroid.co

Change-Id: I57dd1236221eeeb3d938bc6da833f470799b871a