Merge \"Installd: Change app image name computation\" into nyc-mr1-dev
am: 2fc9381a2a

Change-Id: I7f30bb31f4271e508996d83cec7d727d499fd76f