We don't have that many arm64 labels, and it's easier to see all the
labels in one file, so merge the arm64 label file into the main
label file.
Also, update the label name to match the "{image}-{flavor}" format
otherwise used.
Change-Id: Icdcc6c03573748c03b5dd30b3ad6fc6438e40954
d972c9b547