Merge "Bring main.mk in sync with master."