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

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

Change-Id: I6c16e2850580eccee7889feeffdcecd3dcb06af9