Revert "Finalize resource IDs for N."

This reverts commit 7c8e76f87de28acc19935083a0f502df83c4a023.

Bug: 28810934
Change-Id: I3a61bb0c2364909480045dd40adba6445d6afabd
8 files changed