Merge "Regenerate API signature files to correct annotation order" am: 07fcb99b1f
am: 7360dd9e40

Change-Id: Ie90afe7dab27f26d31708ebdb04fffd1c2277209