Merge "updater: Remove an unneeded strdup()." am: ab3c24bd51 am: 76f0edc05e
am: beeef60446

Change-Id: I0e8097aa80adf41c6e62279b6430bd58ef85a1d9