Merge "Revert "Use homogeneous space compaction if proper flag is set."" into lmp-dev-plus-aosp