Merge "respect relative_install_path for binaries in APEXes" am: 1b7a4b0074
am: b6195afa0d

Change-Id: Ied4dbf864557723a24b55d2e4567ea1efaf7f68b