Squashed build fixes:

  * Cleanup arch variant handling.
  * Use headers from bionic after sysroot.
    According to build/configure, inheritance
    order is fine with both flags).