tree c4c7191cd59201e54c97d6a2b5faf99138a89f85
parent d3e05caa477e03767de1baf1e30f9cabbf7e232b
author Colin Cross <ccross@android.com> 1601062510 -0700
committer Colin Cross <ccross@android.com> 1601081583 +0000

Fix ChooseSdkVersion after api levels

I2954bb21c1cfdeb305f25cfb6c8711c930f6ed50 switched normalizeVersions
to work on ApiLevels, which inadvertantly caused it to return "current"
instead of "10000" for libraries that specify "current" in their stubs
property.  ChooseSdkVersion couldn't handle "current" because it was
manually converting the version to an int.  Switch ChooseSdkVersion
to use ApiLevels instead so that it can handle "current".

Test: m checkbuild
Change-Id: Id412359e092483ba419118dd03bc206fae702a96