Merge "Revert "Cleanup references to system/core/base -> system/libbase"" am: 13bc965c2e

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

Change-Id: I13df054cc5b7f602b0a0c59d503797047c4ad378
tree: cd0765c164e1fe8269c3200f74386e35018ebfb3
  1. 29/
  2. 30/
  3. S/
  4. OWNERS