Merge "fugu: update kernel prebuilt am: 2acdeb2a7f am: 880c7f942e" into oc-dr1-dev-plus-aosp