am 4396f662: (-s ours) am c37205f5: Merge "DO NOT MERGE: Abolish source code...
am 4396f662: (-s ours) am c37205f5: Merge "DO NOT MERGE: Abolish source code overlay and introduce overridable src dir" into lmp-dev
* commit '4396f662':
DO NOT MERGE: Abolish source code overlay and introduce overridable src dir