Merge "Add libcore/ojluni/annotations as a source for metalava." am: c12090200d am: 31090fa0b3 am: c7f3c56a29
am: 228ee3501f

Change-Id: I24453ca20ab54f1b0327b6a1af60b814c008ed16