am 401142b3: (-s ours) am 6e28f1c4: am e56ba8b6: Merge "build: All paths are TOP-relative"

* commit '401142b32a3d137d20b61b0146301ebd270b7dfe':