Merge "Rename nativeHoldsLock to holdsLock and make it work on current thread" am: 4eb6fa0e22
am: b4cad762b6

Change-Id: Ia5e21fc613e39bd73e0b6c8525058c2a9e70d7b8