SupportLeanbackDemos: Fix Link Errors am: 4c78d0f4be
am: b9fc06b863

Change-Id: Ie1d566aa05a3a9569e6004bf5cb81a4d4fb395dd