Merge "tools/bit: Avoid leak in error condition" am: db43124b01
am: b3851d92ce

Change-Id: I6b51d22ee200e11b5a731461f295f5da8937a683