Merge "leanback: remove unused resources" into mnc-ub-dev