Use are own common and kernel

Change-Id: I8fb9243f745246098b98a53498c2f2ebf9ce55b1