Update code for custom kernel toolchain

Change-Id: Ie6d9c1af0e4cdbca5401f16dee787ad23c826e88