Merge "Optimization : Do not recurse into unexported Abi."
am: 4a67eaddd6

Change-Id: I1e6941f7be5bb85775625487227813cf6c1b4874