Changes to do away with prebuilt kernel

Change-Id: I0bd5bbf58e522e59a16b144aa7459a2b1f5ec010