- 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 commit05dd567172) (cherry picked from commita9b2fcad7a) (cherry picked from commit4c9d66e56c)