Merge "Change all "final static"s to "static final"." into dalvik-dev