Underp the dialpad buttons

 * Fix weirdo button that joined us with a bad merge

Change-Id: Id54a5883d0fca789f8f53a851363d6eda2aae6af
Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0