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

Change-Id: I4a0d6464908ffa0e34c603ab4c8d9233758a8f41