Merge "Remove @hide from ViewGroup debug methods"