am e4a815d5: Merge "Move up inner class definition"

Merge commit 'e4a815d57632c806b4627636efbb38ec6e04c008' into dalvik-dev

* commit 'e4a815d57632c806b4627636efbb38ec6e04c008':
  Move up inner class definition