abb8e625a3
This reverts commit 166840a3fdd3221c5b3c9973b68cd03c6a7862fc. Reason for revert: ipa-builder needs to be pinned at 2.2.0 but the override-checkout to ussuri blocks that Change-Id: If74df25d4b568f3a9bc0731490ef136b15c5a7ef