775c45c60e
Also, fix a pre-existing bug that caused incorrect compiler option propagation with nested attachments. Fixes #2480. PiperOrigin-RevId: 736156202 Change-Id: Ib430493e8c60556c2312603198587b39de9b8a4a