Merge "Filter ABI if exported include dir is specified." am: 8a0bd01c7b

Change-Id: Ibb840eecad62337c895cf7f818d9e8a5a39774c5