Merge "Explicitly keep stubs as v51 / 1.7 class files"