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

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

Change-Id: Idbfff940be761f2d0d38c4cbf65c36dd82e09a8e