Merge "Revert "Cleanup references to system/core/base -> system/libbase""