Enable libfuzzer_test to handle locking. am: efb907ee15 am: e41c6450df
am: 4f8ef39f58

Change-Id: I32e9719a4c224c8b227f036f6d7523212ae2a267