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

Change-Id: Ifdc2ab0e8c5e393149c1f3f9860037565f0cf2d6