Merge "Revert "Revert "Avoid compiling monster methods in boot image"""