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

Change-Id: Idd2a61c6b1af2c0b4909ba040850a34053f4d636