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

Change-Id: Iee825a63bf9dae64bc775c951bdf60acb5dc3d29