Merge "Improve deterministic boot image compilation with CC collector." am: c3c743a8 am: 7d27fbf2 am: 3eb87fca Change-Id: I4574cccd993a908e4005fc88c66da40613dee258