Remove face unlock support

Change-Id: Id8bfeebecbe66ac4a4ecab733e0768a9af984204
Misc cleanups

Change-Id: Icd0e0f3833de303c73ab05c8dd34b2770ab1c8f1