Merge "Bring abi references directory logic in sync with soong." am: d387a0afc8 am: 91a34dca2a
am: ea54a394a3

Change-Id: Ice5449a99d189134f3968ea57fcd35e82c63cd06