Merge "Merge "marlin: update kernel prebuilt[ DO NOT MERGE ANYWHERE ]" into oc-dev am: b15b1d8eac -s ours am: be0ced2945 -s ours" into oc-dr1-dev-plus-aosp