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