Merge "libjavacore does not need to depend on libfdlibm."