am 520f6ab1: am 6531a977: Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library."

* commit '520f6ab13b56bdaeb21ac99d105ac59a052539a7':
  Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library.