Merge "Update Android.bp following XNNPACK rebase" am: 8c40888011

Change-Id: I4a35309864dcace1107b6a4ffcdcb32216c3659a