am ac8b732e: am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev

* commit 'ac8b732e37ab68046c46b48302663e00a8dcb334':
  Fix missing layout parameters in keyguard.