Merge "Move externally synced framework files to an 'external' folder."