Import internal commit de0473a297248668b55a3385ba5eda7b73184ff3 : [APPROVAL] pending/master/restore_non_standard_bsl_hash_for_strings_drqs37540921 to master
Import internal commit 49a9b029b9417d6b4bfe8ff366c554d82e4fb7d8 : [APPROVAL] pending/master/bslalg_autoarray-move-destructor-usage-drqs-34554786 to master
Merge branch 'import' into import-test
Re-generate gyp files
Merge branch 'upstream-master' into import-test
Increase timeout to see how long bsl_hashtable.t takes to complete