am 2f0ce6ab: Merge "Fix inner class access flags and array modifiers."

* commit '2f0ce6ab114b1036b06c4bd425cd01cb509260bd':
  Fix inner class access flags and array modifiers.