Revert "Move aapt2 cipd package into cipd dir."

This reverts commit 339d6102a2ba914fd53b6dbf66c3c6dcc5ac627c.

Reason for revert: broke clank official builder

Original change's description:
> Move aapt2 cipd package into cipd dir.
>
> Bug: b/359255895
> Change-Id: I4d5fef7f273bf1bb6e334196a5f087a6a419b69c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5786445
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Commit-Queue: Joanna Wang <jojwang@chromium.org>
> Reviewed-by: Junji Watanabe <jwata@google.com>
> Cr-Commit-Position: refs/heads/main@{#1342246}

Bug: b/359255895
Bug: 360283980
Change-Id: I45ae1f87becb210aa6715d1ff978d93326dc0865
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5791991
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1342883}