Adds redirects from trunk to new locations and renames

Change-Id: Ie4bd759e9f35d713e5398b0f70e777771371c125
Closes-bug: 1221778
Merge "Adds redirects from trunk to new locations and renames"