Merge "Update the updater to account for package updates." am: 184ebb706b am: 9f000102f6 am: 0780940483 am: d99586f4af

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1645877

Change-Id: I2fbf462e3dcebef517ecfff298e01d40015e741b