Merge "Remove provide libs from file" am: e11663f483 am: 6333a022b3 am: 5d7d398f8f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1498488

Change-Id: I9a727dca83290579eb9bac238aae317b6b70ff2d