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

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

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