Merge "SupportLeanbackShowcase: add Android.mk am: de41d1a459 am: 2f1ccf605a" into nyc-mr1-dev-plus-aosp