am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."

* commit 'dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
  Avoid supported ABI list containing "unknown".