Track our own fw/av

Change-Id: I5b191afbc1ec05e4e7ace3da613942564f4b388a

Conflicts:
	default.xml