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

Change-Id: I45301ccf8adb56289ffd2262f2f9aae8bc890a96