Merge "Revert "Remove @hide from ViewGroup debug methods""