Merge "Cleanup references to system/core/base -> system/libbase" am: 36e404753a

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1472191

Change-Id: I53a91b09683ba2b75a939211e3b0a1ac7130641c