Merge "bootstat: switch from root.root to system.log" am: de6b44aa0e am: 67ad31b21f am: 81d0f72d41
am: 70132e8f57

Change-Id: I99149104e8deda77ef6897471ced62c66acd1b61