Update for building stock kernel

Change-Id: Ibd2eb9b4714a641588de2f776b8f908c4ef1418a