Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5
am: c025f145cb

Change-Id: I870949d42264520f3f9863aea07e26118865ac44