Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module"

* changes:
  Add support to androidmk_suffix prop
  Generate snapshot list modules