Merge "SupportLeanbackShowcase: bring gradle, build tools, lib up to date am: 15f5a3351f am: 302ab270d6" into nyc-mr1-dev-plus-aosp