Merge "prebuilt kernel (selinux fix, idletimer)"