Merge "Enforce class definition ordering rules in v37 Dex files."