am 4fcbe635: am a0fbb908: (-s ours) am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev

* commit '4fcbe635bfe989b2377d5dec857311a8c37ced47':