am a0a60b37: Revert changes to keyboard_popup.xml for now.

Merge commit 'a0a60b37b265988191083e1b5abbe616a67759b4' into gingerbread-plus-aosp

* commit 'a0a60b37b265988191083e1b5abbe616a67759b4':
  Revert changes to keyboard_popup.xml for now.