Merge "Generic rules to build GKI APEXes" am: 14dd17bd89

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1375334

Change-Id: Ia609c0b8d4b730f17ca6949e2cd955448e288d6f