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