am 0e242b5c: Merge "Revert "[optimizing] Enable x86 long support.""

* commit '0e242b5cad3c0b68b72f28c1e5fd3fdd4c05bfd8':
  Revert "[optimizing] Enable x86 long support."