Merge "Remove treble coredomain whitelist."