Merge "Rename the dir for SystemUpdaterSample." am: a544bfab2b am: 4b52553cbb
am: cf277abb8f

Change-Id: I33d8b8b92963426468f71692aca319fe855306e2