Merge pull request #1664 from null77/support-angle

Fix a few GN build issues.