Merge "Fix SupportLeanbackDemos build"