am 21648b36: Update support lib.

* commit '21648b361e6584fc1abea11674814082dad8105d':
  Update support lib.