Merge "init: delete code that sets ro.recovery_id"
am: 8a5943b37d

Change-Id: I75c8cb2193e71388df0f7013bfa1bd2b0fbcaa21