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

Change-Id: Ib8b88c73fc9997778198dbe73d21d80bf2774e99