Merge "Set WITH_DEFRAG through the common flags (b/30040658)"