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

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

Change-Id: I1609b0998d42c2bd73a71adc61e07bbf919c5316