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

Change-Id: Ia22016998e26c0e1e4b8ae66c035a93a8df6a993