Merge "Walk up tree to find makefiles in mma" am: 5ccafd0f29
am: 8ff4ea8ada

Change-Id: Ic6b1fbdc277ea4776e75d2de83152c57161278bb