Merge "Remove mkuserimg.sh from otatools"
am: 1d5f330c5b

Change-Id: I3598eb310924ab37f459e786e7a7df6ce24e9e49