[automerger skipped] FileUtils: Do not expect Android root without an ending slash
am: e589606348 -s ours
am skip reason: change_id Id83ca985b05bd4e8f85d7ca0b4c8aeea98aa21ee with SHA1 240cb2aa3c is in history

Change-Id: I811fe455dd93efb0e164887dbae30ab3085e71ff