am fcc91b80: resolved conflicts for merge of bebee4fd to lmp-dev-plus-aosp

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