Merge "Add jni_libraries_lock_ to expected_mutexes_on_weak_ref_access_."
am: 6f6bc57285

Change-Id: I420ad6d567728fc5a437a7c83a7e9524914afb0c