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

Change-Id: I45ca14927f59809c16f20267a8f697fb68a992c2