[automerger skipped] Merge "Don't built a platform variant of app glue." am: 0da2fe422c am: f5538578aa -s ours

am skip reason: Change-Id I1e5908e70375158cd184003d17b9b23e74f3365e with SHA-1 990f8adfd2 is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1291097

Change-Id: I06faf59c52240c3fd2712e5498418f43dec6a25b