Merge "releasetools: Remove a dead line." am: 83a6b953c9 am: 9a7201408f
am: 84161e9820

Change-Id: I8712c79112953830b0db4ff034caf552fbe3a921