d2 bringup, sync with cm and kernel revert for caf

This syncs d2 with cm and contains the kernel revert to get it working
with caf.

Change-Id: I50e6845bb77cea76993c67d4ea45a551a7233bcf