Cleanup trying to move to bp

 - Remove some resources that don't appear to do anything
 - Don't assume resource ids are final, because they aren't when
   compiled as a library

Test: build
Change-Id: I498bc2612d3f47df5f567c18c29e1666431e971c
Merged-In: I498bc2612d3f47df5f567c18c29e1666431e971c
(cherry picked from commit 05dd5671)
(cherry picked from commit a9b2fcad)