Merge "Add genrule to find API file Metalava used to generate annotations" am: 034d6782b2 am: 83d3b297c3
am: 7247e371b1

Change-Id: If7ed0f1fa404fbf9c30ab52f1ee3afae7cdf5808