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

Change-Id: Idebdb8de6448ce4b95d201a01c93ba80dfa0ca25