Merge "ART: Make JNI global and weak global locks global"
am: 6021426926

Change-Id: I58b4fb90026fd56b4da04ff7d7ed3c713aef9e6d