Revert^2 "Remove _light / _dark / from "fixed" sys resources"

4a6322a5

Re-attempt fix. See I119f6d7e72dbfd9f1e876e58f6bb221a42edfa0e for
complete plan. This will be manually cherry picked to all known
bad branches.

RESOURCES_FINALIZATION=Manually fix broken UDC release across branches

Bug: 274775529

Merged-In: Ica78ebe4cfd97a8138e5c516922b498b3ed4b51f
Change-Id: Ica78ebe4cfd97a8138e5c516922b498b3ed4b51f