Merge "Revert^2 "Use genrule-built Trusty kernel"" into main am: 6df2399a02

Original change: https://android-review.googlesource.com/c/device/google/cuttlefish_prebuilts/+/3343760

Change-Id: Iead9b1bdbc69609a5003d907fa352ed23a126078
Signed-off-by: Automerger Merge Worker <[email protected]>