Merge "Refactor frameworks-base-overlays."