Merge "Refactor api.go to simplify Android.bp further"