master
8187443: Forest Consolidation: Move files to unified layout
8318964: Fix build failures caused by 8315097