Merge "Fix generated-sources-dir-for for COMMON" am: 623799d3e0 am: 9c4bb4c1c0
am: fb4a7cf865

* commit 'fb4a7cf86544f2fb78f5fa4e950b6974bcb0965d':
  Fix generated-sources-dir-for for COMMON