Fix build and fix buttons check

Change-Id: I9d21e3573e10e4f1554729b3be6a08d8d99a98e9
Signed-off-by: scott <scott@ubuntu>
add button check for home and menu unlock for misc lockscreen.

Change-Id: I6aa52ac70c448a1fd8a48d27a7bb18b78764ffd3
Signed-off-by: scott <scott@ubuntu>
Merge remote-tracking branch 'upstream/kk44' into kk44