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

Change-Id: Icfd39c479a17a8a69b590b6ab12e092dd0873170