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

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

Change-Id: Iad5949abf39afa658782f3581fd0ad35ac95f151