Merge "Bring abi references directory logic in sync with soong."