Merge "Stripping dead API related to keyguard widgets" into jb-mr1-lockscreen-dev