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

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