Merge "Guess source tree root from common file prefix." am: aa94811b2a am: 3390c7de44
am: 2b1a97ddd7

Change-Id: I377264bb6612058dde800e1cc6e318c8a0ba1a7d