Merge "fs_config: introduce TARGET_FS_CONFIG_GEN" am: 54cb05c
am: 43284e2

* commit '43284e2dc5e1c802226bf1608dd85d33ad22907a':
  fs_config: introduce TARGET_FS_CONFIG_GEN

Change-Id: Idd4879971867f697a20c42dda4fcdf8086fd358f