Merge "Lose System.currentTimeMillis, nanoTime, and mapLibraryName to the library."