Revert the package name to the old location's ones

Change-Id: Ibdc7421e3f4bd74086673e139fb16ce27e206e53
152 files changed