Merge "Tighten restrictions on LOCAL_JACK_COVERAGE_(INCLUDE|EXCLUDE)_FILTER" am: 711bfabd50
am: 2338f237a3

Change-Id: I3bc4845e1e2e3ec8aafafc7a80354738069b67b5