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

Change-Id: I2ba292aade2c3612b4876af099b9b72fffb45db2