Merge "Update Android.bp following XNNPACK rebase" am: 4df0b5067f am: 944fcf1709

Original change: https://android-review.googlesource.com/c/platform/external/XNNPACK/+/1650467

Change-Id: If68ebb1e6e7890ca2b5c0e914802fb2c66727464