Merge "Fix DEX signature of inner class constructors"