Merge "Don't regenerate userdata.img when signing"
am: a7adc06e68

Change-Id: Ib6139262f366fa864e03d98796e5384fa12c7c55