am b429d1dc: Merge "Support GenSelect for x86"

* commit 'b429d1dc99b39eadd11f228e520e08b34ba3caf9':
  Support GenSelect for x86