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

Change-Id: I09303439b9ea9c1ae059c7c80d447af46ccf596d