Revert "Some build fixes"

This reverts commit 8e5a418d7661e4498a10b15e1980d5fdca749762.
Revert "Settings: Lockscreen interface initial push"

This reverts commit b116d40ba727b83f91af3a50eab722c7cc6c17ed.