Merge "Update kernel to builds 7479101" into sc-dev-plus-aosp