Merge "Add generic SelectTest JUnit filter and CoreTestsFilter" am: 4864bfa722
am: 713b4ac76f

Change-Id: I9ba844265852ba3d45a5e514e22f84ea92d84b9d