Merge "releasetools: Write back default_system_dev_certificate." am: ff87a9f9d9
am: b55251898d

Change-Id: Ia2b4dc9f853d60f272b494b0d71be4a91383cfb6