Merge "Add libcore/ojluni/annotations as a source for metalava."