Track correct fw_av location

Change-Id: Iac8b537c9973bd285192283927c5c7ca7238655c