Reconcile with AOSP

Change-Id: I865436a73c05b6da5c03bb0f255e7256ca6079c7
diff --git a/kernel b/kernel
index 6f5e427..0766072 100644
--- a/kernel
+++ b/kernel
Binary files differ