Merge "Retroactively add EffectiveNavigation and TabCompat sample code." into jb-dev