Merge "Don't regenerate userdata.img when signing"