Merge "Refactor paths to Android Runtime binaries in directory `cmds/installd/`."
am: 415bf00873

Change-Id: I8fb4d4114fea2ea1ba2814cc1830b350e0c30c1b