Merge "Fix android-support-v17-leanback-docs build."