Merge "Fix sanitizer errors in bootstat.cpp." am: 9ddf491492 am: 2fbf6f1083
am: 824238e69c  -s ours

Change-Id: I3be2d75c20f14fc39744b8de6afc1c4757b32668