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

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