Rebuild from CM sources with the changes done so far. Last merge messed up everything. Now I hope it's fixed again

Change-Id: Ibb2fffd304dfe6d167993b80c974f9334c65faae