Merge "Fix oat_file_assistant_test."
am: 65b49cd274

Change-Id: I35ca6ec5cdb9077f10caf85cda065b1cd586863a