Reconcile with AOSP

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