Merge "NFC build system changes"