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

Change-Id: Ia43e06a1f7169f9ed709fbbb3ef7763b9155daf2