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

Change-Id: I8627e0181ac68effdcba4bd9b76349cb865c96ee
Use jdi cmdline as kernel cmdline for my device