Merge "Minimal changes to build fastboot as a library."
am: 20d2159803

Change-Id: Ic24a9abfeb591552b617161112a00e7741bde977