Merge "Remove unnecessary filtering of android.test.mock files"