Merge "Make prebuilt_etc for public.libraries.android.txt" am: 0bfa7c92f1 am: df2d1c1827

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

Change-Id: I83d084deefda28a1e613bcce233ce0378d3d88c4