Merge "sunfish: update kernel-and-modules prebuilt [ DO NOT MERGE ] am: 3d0444ecca am: 8c4ff8e2e1" into rvc-d1-dev-plus-aosp