Merge "Cleanup references to system/core/base -> system/libbase" am: 1833bc3c61 am: ceac2e6ba8 am: db969d73d3 am: 3fa9df4f14

Original change: https://android-review.googlesource.com/c/platform/frameworks/ml/+/1472303

Change-Id: I8e4b60a379bd4cc5a61ff913cd9d79438cef18fd