Merge "Revert "Revert "Switch "system/core/base" ref to "system/libbase""""