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

Change-Id: Ib212d15d739ccd4360e37651b90d679f7b9b4fe2