This reverts commit 67c3467508. This is needed because aiab versions.yaml points to an armada that is too old to support this. Change-Id: I5c6350636e9575b4e48a1a54ef949601a28041f5
67c3467508