Merge "Add a logo to the fastbootd screen." am: d294935bf7
am: dbefca86b8

Change-Id: I5068b33ee54aa847356ef167122953d16e735e43