8056062: Additional minor cleanups from source restructure build changes

Reviewed-by: alanb, tbell
2 files changed