am: f2197e43 * commit 'f2197e43': Revert "Disable some image_test cases with concurrent collector." Fix image_test for the CC collector. Change-Id: I91f1527c9b32cc3889b64a8c30486ee9c0a29f16