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

* commit '6fb2ea567970f155386c6c0301a94142a954cc27':
  Fix inner class access flags and array modifiers.