Merge "Remove dependency on libcore internal annotation"