Merge changes Ie23877ac,I262f6be8
am: f2197e4

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

Change-Id: I91f1527c9b32cc3889b64a8c30486ee9c0a29f16