am b4c8cf6a: am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev

* commit 'b4c8cf6ac473c33d946043b2e4cc9f7ba91dd8ce':
  Use stable layouts for keyguard/SlidingChallengeLayout