GitLab

Also renames the nested targets to follow current conventions and to
ensure that any bot that does still depend on the _apk target will fail
because of this.

TBR=agrieve  # trivial test update

Change-Id: Ic958e1e74dd2f9628512369bd5a7ce01dd9c19cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857571
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707850}