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

Change-Id: Ib417abbcf4ce2b18f508af9e0ef95e4cca789c02