Merge "Remove unnecessary @inheritDoc, add missing @Override to ViewGroup"