[automerger skipped] Skip ab/6749736 in stage. am: 3d22910089 -s ours am: 98b5e240eb -s ours

am skip reason: Change-Id I786a11712dd0f5139b8b69bff36c916a7a80b29f with SHA-1 f1bc609120 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12797044

Change-Id: Ibae67125d5ff8602c1ea0c4a2c97928baaebbb98
tree: 703130dd9b051b0f64dd23f4d9c9e2d2a01e70c0
  1. hikey/
  2. hikey960/
  3. update-prebuilts.sh