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

* commit '296bab8a6aadf61235e87a6bdcd7085af40eeacd':

Change-Id: Icf1b9650d29c6611dfff7d8e0b25a382805bd04a