Merge "Makefile: Pack libsparse-host.so into otatools.zip." am: a85248b489 am: 3d7e6ca49c am: f6b6de96b1
am: 69850da494

Change-Id: Ic8d66c86198b15c8b442afb2bc59753f50d98c2a