Merge "Do not create ABI dumps in AOSP directories for vendor libraries"