Merge "Remove --skip-annotation-instance-methods=false metalava option"