Merge "fugu: update kernel prebuilt am: 603a85fac8 am: a2388013f3" into oc-dr1-dev-plus-aosp