Merge "Move buildspec vars to BoardConfig.mk"