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

Change-Id: I7f508c96e6c3537eefa146a6e919304a37603c5b