Merge "otatools: added missing shared library for make_ext4fs" am: 0ced0a1f50 am: 372a877659
am: b6f7b14c0e

Change-Id: Icb8c38c7f2440664c02c14d1c7b04ba03e7949b5