[automerger skipped] Merge "Regenerate API signature files to correct...
[automerger skipped] Merge "Regenerate API signature files to correct annotation order" am: 07fcb99b am: 7360dd9e
am: b3f7755a -s ours
am skip reason: change_id I0a3d967571bb2f796f65c96a9ce9121e3538bad9 with SHA1 7ba79915 is in history
Change-Id: Ia76d0f99ba8db30bf53cf6bd8e661fa9f1d7e3e7