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

Change-Id: I54f811e364fdec10f6b847da1f4e0e23a8fc5f28