Merge "Refactor api.go to simplify Android.bp further" am: aa2823a482

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1947111

Change-Id: If361fe19ce2c69454dae92f8149631dcce35419a