Clean move of files to keep the git history

Test: No. This is just intrim change. Build will be fixed by
      the following change.
Bug: 65851881

Change-Id: I8285b3b79eeaf76fadc2242c71e999434f467c12
6 files changed