Merge "Multi-Project Commit: Move of filterfw out of system/media (2 of 7)"