Merge "ParseFloat/ParseDouble, also take std::string"
am: edc9cee49b

Change-Id: Ied3fd7325d8901b2cd155c95239e6dc65032433d