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