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

Change-Id: Ic7655644b16450efa2b93cfd35b07748ef548994