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

Change-Id: I731caa22fcdb61523f55ded32a88c0da1ae688b9