Merge "Revert "Remove libcpp_is_static""