Remove extra framework res entries

Change-Id: I6021a541334248f80026abb0b3364ccf2c8dd235
Merge "Remove extra framework res entries" into cm-11.0