master
8187443: Forest Consolidation: Move files to unified layout
8071469: Cleanup include and exclude of sound native libraries