Merge "bootstat: bootloader stat files misspelled" am: b04f454216 am: 2c1ecaa540 am: 4ccde7c4b8
am: b32a04436a

Change-Id: Ic064bf8d52dd379a30a1c58020ca6027c488c704