Merge "Change all "final static"s to "static final"." into dalvik-dev
tree: 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
  1. src/