[automerger skipped] marlin: update kernel prebuilt [ DO NOT MERGE ] am: d13f17e4d1  -s ours
am: fadd5d868c

Change-Id: I2cfa536c56968df4e55fedfb70ba1446cd4c4cf7