Merge "Revert "Switch "system/core/base" ref to "system/libbase""" am: ad5f9c3820

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1476116

Change-Id: Icecc98713b3e6dba1b677f631945dd282f612006