Replace manual genrule modules with combined_apis am: ec450c058e

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

Change-Id: I5275a7d09ace620d7d685e05492e677669261236