Back to stock AOSP kernel for now

Change-Id: Idcf0cdea4f9294976984935f583fdd8f5fc1e3a9