Revert "Resource ID fixup."

This reverts commit e6d161554f4cb84a6a5410b2b7e9ed5348bdf96d.

Bug: 37480230
Test: build
Change-Id: I2322c34132c5c8761d7506b00b2a8cdd286a5e48
4 files changed