Merge "Add filter support for native tests. Also restructure filtering for InstrumentationTests."