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

Change-Id: I1d299af497d0daeac276fba8695c28298fd37365