Merge "Fix locking of libnativeloader"