Merge "Change logpersist.start to sh_binary" am: d0accefc05
am: 8df5dd0a23

Change-Id: Idd8ea015b7f06cd1ff65ef2aac510ade49612eb2