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

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

Change-Id: Ib977da1ad620ddd8efb24c308beec6b3e40befed
tree: 40434b05873b28ab8846ac0d51dffde9f84bc701
  1. 30/
  2. S/