Merge "update kernel" into gingerbread