Pie: Fix alignment of Halo and ClearAll buttons layouts with clock

They were on top of the baseline (Clock).

Change-Id: I57fbcfba513537786d0d0d6ad1266efd44b12894
Pie: Margins derp

Change-Id: Ia983d8849819a667c6658120650d8522b7941fc2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2