Merge "Remove abi-tool directory"
am: 5cec2d670d

Change-Id: I3af6ea2a1502e16db16b7f753e6d4ffb212d4e36