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

Change-Id: I4ab166872dc985c98d4771d4715a0d059de80dd7