Merge "Remove libcore include dependency"