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

Change-Id: I8595bdb4a54918eb21d0fb08223fa0569fec121f