Merge "Remove abi-tool directory" am: 5cec2d670d am: d832c6021b
am: 99eef71525

Change-Id: Ic98907f1f12e1fca673d51c3a67391c1fbc636f4