Refactoring in preparation for adding deapexer support to apex_set. Bug: 181267622 Test: m droid Change-Id: I8e7661ff4cfbe68f62e14d3bdf20d9356934e351
Refactoring in preparation for adding deapexer support to apex_set. Bug: 181267622 Test: m droid Change-Id: I8e7661ff4cfbe68f62e14d3bdf20d9356934e351