Merge "bootstat: crash when parsing ro.boot.boottime" am: c1fd33546e am: 2d63629f5f
am: 2dc70539b8

Change-Id: Idfad4c3775568deaf727167ee189b2db29ab19d8