Merge "Fix inner class access flags and array modifiers."