Move libraries from overriding

Bug: 170476820

Test: trybots

Change-Id: I1fe74549084b0959839a98afe4e186d153f7a25c
Merged-In: I1fe74549084b0959839a98afe4e186d153f7a25c
14 files changed