am fb8a07bd: Merge "ART: Refactor GenSelect, refactor gen_common accordingly"

* commit 'fb8a07bdf92ab097c1d309a8a6b70dacc81f4478':
  ART: Refactor GenSelect, refactor gen_common accordingly