Re-add modules and prebuilt kernel

Change-Id: If3f56be307f7a5752091775e5c247f515112d719