Merge changes Ie23877ac,I262f6be8 am: f2197e4
am: 39881e2

* commit '39881e263e6844766dbca14509226b87e5cf65f8':
  Revert "Disable some image_test cases with concurrent collector."
  Fix image_test for the CC collector.

Change-Id: I226b9341418d659a8dc59ba1465a8023fd034c88