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

Change-Id: Ia88d643f21891df7514a5d3500e897607ef23260