Bug 946065 - Flatten content subdirectories. r=Callek
bug 960065: tegra and panda decomm. r=callek