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

Change-Id: I9bfb0961d155e36ed6b5cf84040c38ddb30a2acd