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

Change-Id: Id5d3ad6f3aaad8c774cf58dee35679d02b534f67