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

Change-Id: Idc253544cca63619abb2070390e52bf325699709