Merge "Delete duplicate SharedLog and use frameworks/libs/net version"