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

Change-Id: If06d9dc1f4ae1d45640877f5e03f193bae6c615a