Fix Mako dependencies Layout

Change-Id: Iccd5136ea6966188b44e440b382c7ce1f9f1d7ca