Merge "ART: Fix assembler_test to use ScratchFile"