Merge "Only allow short functions in class definitions." am: e3b27d22bf am: 8726529e3e am: 6d42bf740b
am: 88b10f99a6

Change-Id: I7844af0a91a5b7d18409e9bd8f04519e3cd30f37