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

Change-Id: I11f458be5258eb1936b11b95086ff52dfc058d93