Merge \"OatFileAssistantTest: do not relocate image randomly.\"
am: 9822f6b81f

Change-Id: I4c443278e4a7af5de0831dacf60164b4c709077d