Merge "Returns a service parse error on overrides across the treble boundary."