Merge "soong: Align update boot jar variable with system_server jar"
am: d6fb4842c9

Change-Id: If93859af6ca6a7b464de66b9278741ecc1bd279e