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

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

Change-Id: Ib1d7a37311ea9342479ab9cf246d0fd0bac18471