(minor) cleanup of lib resources

Change-Id: I8c87ebae817fd157ef43aef0b6692745a912c283
Merge "(minor) cleanup of lib resources"