use WeakImplhelper1 for ContentIdentifier

Change-Id: I830d2642bde6affbc400fbaab11955ac082b7bc5
de-macroize ucb sortdynres

Change-Id: I292875fde0be3f838ad838233df11d765e4affd1