Merge "Regenerate API signature files to correct annotation order"