[automerger skipped] Mark ab/7061308 as merged in stage. am: e55c9aa7ff -s ours am: 61b62a608b -s ours

am skip reason: Change-Id I1fe9023e29d5b1e7d1dbb240fcf397a7010fbc4b with SHA-1 0a8ff1dbc4 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c42bd5c48ad79bc64967adb0baeecbfc810a5e3
tree: 7e0fe52d8664fbfd32073e180e0eeb839f6fa182
  1. hikey/
  2. hikey960/
  3. update-prebuilts.sh