am df3633b3: Merge "Make it harder for apps to mess up ViewGroup\'s internal state Bug #6421288" into jb-dev

* commit 'df3633b38969e134c5370449b8247827c705ac1e':
  Make it harder for apps to mess up ViewGroup's internal state Bug #6421288