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

Change-Id: I609a77a3eb6d61e60bea63d8e87eab1ab042eaf9