Merge "Merge "fugu: update kernel prebuilt" into oc-dev am: 11b1732730 am: d3ca25a0d2" into oc-dr1-dev-plus-aosp