The ordering of method declaration modifiers changed slightly
to reflect the ordering given in:
http://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.3
http://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.4
Bug: 26241119
(cherry-picked from commit ca59875e12
)
Change-Id: I8489ad5010fc811b22167af50ba29221aac8b6cb