Merge "Fix the lib directory being used for fetching libraries." am:...

Merge "Fix the lib directory being used for fetching libraries." am: d118b1c2 am: bb038e28 am: e233f138 am: a27f44ef

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1382656

Change-Id: Ie532adbac194cad4c5b43f1ddb424823add04bcc