am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." automerge: 681e6df1
automerge: 25c29c1

* commit '25c29c19474e5cb359473d3d36fdb1eddb90f50b':
  Move frameworks users over to libcore hex encoding API.