Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307
am: 2cb1fb45c0

Change-Id: Ia4d4dd1f1f0e2667d0b4bbe06c76d20663ce580f