fw/av: fixup after 4.4.1 merge

*minor formatting issues
*redundant include
*code cleanup

Change-Id: If7fc9bbd279fe53c7c6fe9d0f56f5ed500048eb7
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>