Merge "Enable system stats for archive-build macro"