Merge "Improve deterministic boot image compilation with CC collector."