Merge "fugu: update kernel prebuilt[ DO NOT MERGE ] am: e02772744b  -s ours am: e5119a5930 am: 95edaf1a6a am: 6a4e58efaa" into oc-mr1-dev-plus-aosp