Libphonenumber update and codecleanups