Merge "Fix ClinitCheck pruning." am: d846a2cc45
am: 5719078766

* commit '5719078766c6008a7db488c730c21cbf20f2fd60':
  Fix ClinitCheck pruning.