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

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

Change-Id: Ibbca1b3e47d62bea9b17568e6f73cc6359928a91