Merge "marlin: update kernel prebuilt[ DO NOT MERGE ANYWHERE ]" into oc-dev am: b15b1d8eac  -s ours
am: 6c45618406  -s ours

Change-Id: I70f7f05a2cc4157166d308882e2d5a36817d9322