Settings: Lock before unlock the new way (2/2)

for more information see fb commit please.
target selection if lock before unlock is activated
will be enabled and shows the repective settings dependend
on if it is a phone or tablet

Change-Id: I6bb41539383c2b02b62354b00c773505f396028e
Build CarbonFibers into Settings package itself (1/3)

Change-Id: If1307187ee9b5afac8099dfd63054a62fa81e70e
Signed-off-by: Daniel MM <daxx4182@gmail.com>
Merge remote-tracking branch 'upstream/kk' into kk