Update autogenerate tools for new directory struct

This patch fixes autogenerate tool references to directories
that will be moved during the Great Rename Of 2013

Change-Id: Ia20455d74e5bcdb172ccd09dacce5fa76c688e90
Merge "Update autogenerate tools for new directory struct"