Merge "Revert "Fix DEX signature of inner class constructors""