Merge "Fix sanitizer errors in bootstat.cpp." am: 9ddf491492
am: 2fbf6f1083

Change-Id: Ia2fd1bf3245998cf9e6c14b2b45af0b8cc0adcb0