Merge "Remove custom annotation libs"