g2: Make merges easier from CM: mv rootdir/* .

Change-Id: I8627e0181ac68effdcba4bd9b76349cb865c96ee
Use jdi cmdline as kernel cmdline for my device
camera: Move the focus state set

Doing this on preview isn't enough. Solve the race condition by
cancelling ongoing focus messages if a new one is requested

Change-Id: I0c2268d44f18056fea0263c0a420c67eac106db6