Merge "Modify the library fix up code." am: 6cfcae6cb3

Original change: https://android-review.googlesource.com/c/platform/development/+/1824372

Change-Id: Id2d4741523691a5ccf396b5e4303fdfec8b9341e