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