Merge "Revert "Cleanup references to system/core/base -> system/libbase"" am: 0ebb2b6290 am: b3492e2451

Original change: https://android-review.googlesource.com/c/platform/prebuilts/abi-dumps/platform/+/1477559

Change-Id: I5ddae9cbc30242d1300443bcebf60bcb4c76999e
tree: c66a3e242ab8ca9667fcb88fc4896bfca03c9d78
  1. 30/
  2. S/