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

Change-Id: Ia63454c6cb66d8e20f05774617280d1a21bb91fb