Merge "bullhead: update kernel prebuilt[ DO NOT MERGE ] am: b6708ca998  -s ours am: ae8a995f36 am: b6d9785668 am: 873e44a58b" into oc-mr1-dev-plus-aosp