Merge "Update doclava to accept androidSupportRef argument"