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

Change-Id: Id56de01fede79702bc1942abcd4baf147968141f