Merge "fastboot: remove engine.cpp/engine.h" am: e6fc328d16
am: ea2b935681

Change-Id: I5977fd0568a35d8112a4373e159d325191f42baa