Merge "Fix AppCompactorTest and add a presubmit TEST_RULE"