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

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

Change-Id: If4f9b0ff992b6b3dc53f6b5d043241104b14ff49